Produced by Araxis Merge on 2022-11-18 03:12:08 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.
| # | Location | File | Last Modified |
|---|---|---|---|
| 1 | Porto Theme/app/design/frontend/Smartwave/porto/Magento_Sales/email | shipment_update.html | 2016-06-21 09:41:00 +0000 |
| 2 | Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Magento_Sales/email | shipment_update.html | 2022-11-02 03:47:33 +0000 |
| Description | Between Files 1 and 2 | |
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 10 | 80 |
| Changed | 7 | 27 |
| Inserted | 1 | 1 |
| Removed | 1 | 1 |
| Whitespace | Consecutive whitespace is treated as a single space |
|---|---|
| Character case | Differences in character case are significant |
| Line endings | Differences in line endings (CR and LF characters) are ignored |
| CR/LF characters | Not shown in the comparison detail |
| Active line-pairing rules |
No regular expressions were active.
| 1 | <!-- | 1 | <!-- | |||
| 2 | /** | 2 | /** | |||
| 3 | * Copyright © 2016 Magento | 3 | * Copyright © | |||
| 4 | * See COPYING.txt for license details. | 4 | * See COPYING.txt for license details. | |||
| 5 | */ | 5 | */ | |||
| 6 | --> | 6 | --> | |||
| 7 | <!--@subject {{trans "Update to your %store_name shipment" store_name=$store.getFrontendName()}} @--> | 7 | <!--@subject {{trans "Update to your %store_name shipment" store_name=$store.frontend_name}} @--> | |||
| 8 | <!--@vars { | 8 | <!--@vars { | |||
| 9 | "var this.getUrl($store, 'customer/account/' | 9 | "var this.getUrl($store, | |||
| 10 | "var order.getCustomerName()":"Customer Name", | 10 | "var order_data.customer_name":"Customer Name", | |||
| 11 | "var comment | 11 | "var comment|escape|nl2br":"Order Comment", | |||
| 12 | "var order.increment_id":"Order Id", | 12 | "var order.increment_id":"Order Id", | |||
| 13 | "var order.getStatusLabel()":"Order Status", | 13 | "var order_data.frontend_status_label":"Order Status", | |||
| 14 | "var shipment.increment_id":"Shipment Id" | 14 | "var shipment.increment_id":"Shipment Id", | |||
| 15 | "var store.frontend_name":"Store Frontend Name", | |||||
| 16 | "var store_phone":"Store Phone", | |||||
| 17 | "var store_email":"Store Email", | |||||
| 18 | "var store_hours":"Store Hours" | |||||
| 15 | } @--> | 19 | } @--> | |||
| 16 | {{template config_path="design/email/header_template"}} | 20 | {{template config_path="design/email/header_template"}} | |||
| 17 | 21 | |||||
| 18 | <table> | 22 | <table> | |||
| 19 | <tr class="email-intro"> | 23 | <tr class="email-intro"> | |||
| 20 | <td> | 24 | <td> | |||
| 21 | <p class="greeting">{{trans "%name," name=$order.getCustomerName()}}</p> | 25 | <p class="greeting">{{trans "%name," name=$order_data.customer_name}}</p> | |||
| 22 | <p> | 26 | <p> | |||
| 23 | {{trans | 27 | {{trans | |||
| 24 | "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>." | 28 | "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>." | |||
| 25 | 29 | |||||
| 26 | increment_id=$order.increment_id | 30 | increment_id=$order.increment_id | |||
| 27 | order_status=$order.getStatusLabel() | 31 | order_status=$order_data.frontend_status_label | |||
| 28 | |raw}} | 32 | |raw}} | |||
| 29 | {{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}} | |||||
| 30 | </p> | 33 | </p> | |||
| 34 | <p>{{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}</p> | |||||
| 31 | <p> | 35 | <p> | |||
| 32 | {{trans 'If you have questions about your order, you can email us at <a href="mailto:%store_email">%store_email</a>.' store_email=$store_email |raw}} | 36 | {{trans 'If you have questions about your order, you can email us at <a href="mailto:%store_email">%store_email</a> | |||
| 37 | {{depend store_hours}} | |||||
| 38 | {{trans 'Our hours are <span class="no-link">%store_hours</span>.' store_hours=$store_hours |raw}} | |||||
| 39 | {{/depend}} | |||||
| 33 | </p> | 40 | </p> | |||
| 34 | </td> | 41 | </td> | |||
| 35 | </tr> | 42 | </tr> | |||
| 36 | <tr class="email-information"> | 43 | <tr class="email-information"> | |||
| 37 | <td> | 44 | <td> | |||
| 38 | {{depend comment}} | 45 | {{depend comment}} | |||
| 39 | <table class="message-info"> | 46 | <table class="message-info"> | |||
| 40 | <tr> | 47 | <tr> | |||
| 41 | <td> | 48 | <td> | |||
| 42 | {{var comment|escape|nl2br}} | 49 | {{var comment|escape|nl2br}} | |||
| 43 | </td> | 50 | </td> | |||
| 44 | </tr> | 51 | </tr> | |||
| 45 | </table> | 52 | </table> | |||
| 46 | {{/depend}} | 53 | {{/depend}} | |||
| 47 | </td> | 54 | </td> | |||
| 48 | </tr> | 55 | </tr> | |||
| 49 | </table> | 56 | </table> | |||
| 50 | 57 | |||||
| 51 | {{template config_path="design/email/footer_template"}} | 58 | {{template config_path="design/email/footer_template"}} |
Araxis Merge (but not the data content of this report) is Copyright © 1993–2019 Araxis Ltd (www.araxis.com). All rights reserved.